9c863f
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -258,8 +258,7 @@
public class SimpleAmqpHeaderMapper extends AbstractHeaderMapper<MessageProperti
 	/**
 	 * Will extract Content-Type from MessageHeaders and convert it to String if possible
 	 * Required since Content-Type can be represented as org.springframework.http.MediaType
-	 * see INT-2713 for more details
-	 *
+	 * or org.springframework.util.MimeType.
 	 */
 	private String extractContentTypeAsString(Map<String, Object> headers) {
 		String contentTypeStringValue = null;
@@ -269,7 +268,9 @@
public class SimpleAmqpHeaderMapper extends AbstractHeaderMapper<MessageProperti
 		if (contentType != null) {
 			String contentTypeClassName = contentType.getClass().getName();
 
-			if (contentTypeClassName.equals("org.springframework.http.MediaType")) { // see INT-2713
+			// TODO: 2.0 - check instanceof MimeType instead
+			if (contentTypeClassName.equals("org.springframework.http.MediaType")
+					|| contentTypeClassName.equals("org.springframework.util.MimeType")) {
 				contentTypeStringValue = contentType.toString();
 			}
 			else if (contentType instanceof String) {
